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

Change-Id: Ie365d20f3ff63379f03fc72e54c9d2a82b134f4b