Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 3c1c2415f5

Change-Id: Ie01a4ca6e519df107def8e84e1ad4ce71dc2605c