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

Change-Id: I4bc599007e2fb685122c178b63495aacb0b8591a