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

Change-Id: Ieea6bac7803a2753f108eb4ac1717449d2ffafbc