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

Change-Id: Ibbc4c064b48a3df1f6c2fb34536b379595c0d012