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

Change-Id: Ieb07ac5b461a6b48686510f7dcdf9445962b8b02