Merge stage-aosp-master into pi-dev-plus-aosp
am: 16e7c2a6ac

Change-Id: Ie54c2a5ee3a17d40d332598f2b09bec09fcb2aa8