Merge stage-aosp-master into pi-dev-plus-aosp
am: 58e07f2e23

Change-Id: I427df01d34afe1ac48370052d197be1cfe055acc