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

Change-Id: Ib9c8ca0370bee684b8b6ae903325ea8f1f1b34d3