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

Change-Id: I8f745ff5aaa4bba75d7e127f7b0bc36ccf4e802b