Merge stage-aosp-master into pi-dev-plus-aosp
am: 77a88c0b05

Change-Id: I3d5b24aa2cbc18ad3c106052d724105a0cb934e5