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

Change-Id: Id43a9a673d81ec8b630075072765656547370b8d