Merge stage-aosp-master into pi-dev-plus-aosp am: 304fad4aad Change-Id: I006f4102aa57750010bbc271c2b88220ecad555f