Merge stage-aosp-master into pi-dev-plus-aosp
am: 18ca7dfd42

Change-Id: Ia743f24b0e867ab8b6ac3c60688c5d78b450f9de