Merge stage-aosp-master into pi-dev-plus-aosp
am: 286044b8e3

Change-Id: Icfdd57a4f3345a0eca5e5093c0a6236c03c5be88