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

Change-Id: I7d116432f00f123b585edaa9796de9380ce8fdd4