Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: 8a3f0914c0

Change-Id: Ia856b8f53db2e1cfef8dd15ac1b078c2417d4d08