Merge stage-aosp-master into pi-dev-plus-aosp
am: 34e4fc653b

Change-Id: I2900b4f685490787d30d2c861942c2ab992933a7