Merge stage-aosp-master into pi-dev-plus-aosp
am: 4f65da7e01

Change-Id: I6ac8daa2b8d693dcf316c72e7737bd1777d96364