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

Change-Id: Ief5903bd5cf97535356ebea59405af7d257414e2