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

Change-Id: Ia67b88d453670d5df0ad86351c5b5ff7044db8c4