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

Change-Id: I1d2f55267cc87f23d9a86f17f3df5f5f98065f5b