Merge stage-aosp-master into pi-dev-plus-aosp
am: 8612b25242

Change-Id: I575f2b850f3b5c4fb71258359f253545a19e122b