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

Change-Id: Ib683e84842c6d6899f08756bce932c69374f9f5e