Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 321fe59cb7
am: 8adf689015

Change-Id: I9dca57b28e114c7d21795a83dcbfe6a7b6366d6d