Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: c07e2f6e54 am: 758207e7d3 Change-Id: I90ee8167e3937c4910be35c45555ab52b5e9af9f