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

Change-Id: I25b1bc86f20052a08f4adb7de43104cf13b24794