Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 13686a1cc5

Change-Id: Iea8a33e07c1fba03eaec396ff6b7177c29f4d208