tree f63b50185e4560d120df886d3e9e853474cc0570
parent 4a06cd2b5744bd19febdd40c451091fc0662d097
parent 4d7338e13f421ba93b3a151cc78f19c07c9e342f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1775971778 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1775971778 -0700

Merge cherrypicks of ['googleplex-android-review.googlesource.com/39271686', 'googleplex-android-review.googlesource.com/39271688'] into 26Q2-release.

Change-Id: I369447d7d3c3b75ed68b9ac16620141f849b9979