Merge stage-aosp-master into pi-dev-plus-aosp
am: 5f5c832b42

Change-Id: I50347c3b7c698cd1ac5948c441b589a99a4245eb