Merge stage-aosp-master into pi-dev-plus-aosp am: 106c2a70be Change-Id: Ia5455b440409ba99813ca4743611e7e6fc636828