Merge stage-aosp-master into pi-dev-plus-aosp
am: 35b772680e

Change-Id: Ic8eac481c754f991572b2cae45a47aa25f6a7b3a