Merge stage-aosp-master into pi-dev-plus-aosp
am: 07ae858e5d

Change-Id: I429889d59ac79aa336afda3a9d2041bde84e2e97