Merge stage-aosp-master into pi-dev-plus-aosp
am: f5aa9d620d

Change-Id: I39aabdb10296c373e32637c02cadf2b3140eac5d