Merge stage-aosp-master into pi-dev-plus-aosp
am: 9b2f248fc3

Change-Id: I5f3ca7135e31a5aa08ac1623c243dd01d99f11aa