Merge stage-aosp-master into pi-dev-plus-aosp am: 136cda1314 Change-Id: Ifbd99ff8bc97fcab6f5cd3ac85344915aac13904