Merge stage-aosp-master into pi-dev-plus-aosp
am: 744329796f

Change-Id: Ib36087c002c661550499274e47ad1089648c249a