Merge stage-aosp-master into pi-dev-plus-aosp
am: 546861c684

Change-Id: Id0bb0de9600d065605d956b5db8b68a804c7699a