Merge pi-dev-plus-aosp-without-vendor into stage-dr1-aosp-master
am: 5f945f25cc

Change-Id: I98b212f92761a267507d3515061c43a37f76f571