Merge stage-aosp-master into pi-dev-plus-aosp
am: 76a72eaa29

Change-Id: I89e86dc0aae7ca5aae569266b983516eec0b15ce