Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 751a1019e9
am: 6a7faca870

Change-Id: I35968aa0a4a07db2530eb3166d30764409092b70