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

Change-Id: I95bc288ca3e49a18259fe1e0dc853437d3b7da02