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

Change-Id: I8f50d79e3e1d9636b1a8a759ec6f78c25833bb0b