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

Change-Id: Ic86076d1b432b160e455204acc018c12664bf044