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

Change-Id: I923f3565ca3a8c9ffaaa1a55247066d1b1ea6a0d