Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 2027b47914

Change-Id: Ia77f88e1ae0ccaee16c7c1ca2bd78ba5bbdf4b20