Import changes made on the experimental branch in preparation for merging the two branches. Change-Id: I7b5b8fb4fca155cb1d72e7ba13eef18e6a94a298
Change-Id: Ib0c280e1fcfd977e11e4390807b2c8077a87500c