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

Change-Id: Ia1c562b42dfc381437f27317e55ac81500407958