Merge stage-aosp-master into pi-dev-plus-aosp
am: 2741fe00d4

Change-Id: Ie86a297815c52ae187ea1d9949a38da1971e7a4e