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

Change-Id: Id508a2dd91c5e320c37485df71ba6342d7e99610