Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master am: 5e6830c783
am: 625bfcf511

Change-Id: Iadf09641b976f5b25a5c46cce3aebe6f4fa87d2a