Merge stage-aosp-master into pi-dev-plus-aosp
am: 4f2f20e625

Change-Id: I5a2ac3466d81264e706cea9640f15353cbd9a569