Merge stage-aosp-master into pi-dev-plus-aosp
am: 0b5d64d2ae

Change-Id: Ic9542b375c18b0089f87303f79af62136770d16f