Merge stage-aosp-master into pi-dev-plus-aosp
am: 1cb81eb235

Change-Id: Ic5d9996a6feef9a33d1b281baf720b1d7cf3d3c6