Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 264c31532f

Change-Id: Ie3c446695b411413e19469b202a59c17d25f5fe9