Merge stage-aosp-master into pi-dev-plus-aosp
am: 19a36a9e8a

Change-Id: I38e796edff04f511b4b68320f6c45bb5f1a053f9