Merge stage-aosp-master into pi-dev-plus-aosp
am: 45645b316c

Change-Id: I88ab67446d2344e05738bc988177de6101f58c7d