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

Change-Id: Ie2fd529e8ef0d366625f3d70b60eddc066e50e47