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

Change-Id: I0e4b960cb2dc5066fc9d06765c2237943717fd74