Merge stage-aosp-master into pi-dev-plus-aosp
am: 35270ef3ba

Change-Id: Ibb8f31291211399160bea3362430b42db4cb12fa