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

Change-Id: If549e76938c6f7c3c130d1a1906f0ae0667cd51e