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

Change-Id: I3b4dbc1ca1da0ae2fb022ae5f3b120f1ff2fa536