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

Change-Id: I821ff1db08da88ead5ab8d78688b8364bdaf7efa