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

Change-Id: I8885534e5e57e309fa38fd4a8592053c5da62ec9