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

Change-Id: Ifc784cc6f4a6434141e9be9f4a090805f6044a30