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

Change-Id: I69bbc643545ee9dd1f02266723e30a1589c335ed