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

Change-Id: I8b542771cbc626991b509ddcfba592b27f64846e