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

Change-Id: Idc712e2802dc9f0bef9c2375e10b6f8f86101667