Merge stage-aosp-master into pi-dev-plus-aosp
am: 055fce58be

Change-Id: Ib3b2c7e6f0b85b29763e0b2882b9e026fe26e0d6