Merge stage-aosp-master into pi-dev-plus-aosp
am: 50af6ca0bc

Change-Id: Ia57643ca6ba1aa70eec16c001f835b6ea236c6db