Merge stage-aosp-master into pi-dev-plus-aosp
am: a2c32fd184

Change-Id: I746664b6ea4d80da2399874dd09be240ca1eb3d0