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

Change-Id: Iddc7074f84dc3793372807f7892b12ba197d00fa