Merge stage-aosp-master into pi-dev-plus-aosp
am: 17b165641f

Change-Id: I4ae9aa5755827636254c1833c42a04d4c42cce53