Merge stage-aosp-master into pi-dev-plus-aosp
am: 8c6c045aba

Change-Id: Ie2fa97b180b42f225c893e756b0e685a5c4bbc8b