Merge stage-aosp-master into pi-dev-plus-aosp
am: d7f24054c0

Change-Id: I4b861040a7334d9f35a6d1c2d890812522a72928