Merge stage-aosp-master into pi-dev-plus-aosp
am: 5a868db195

Change-Id: Ie60d13f5220180b40fbd7b5f2eeb163cea48bfa1