tree 95580b01cd25e28d0aa64b4317dcbd2408a8f955
parent ba064b1afedd32978da042bbc51f084f7b25d8fa
parent d4d870386b2cde4952ff9bc26643c4319ddbfee6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1635860785 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1635860785 +0000

Merge cherrypicks of [16074852, 16074853] into sc-qpr1-d-release.

Change-Id: I32fadccbc4b159436b3e631e762d070843077608