tree b30bdd89150cd90ef8610cb238c86cbe907a3ca2
parent 2aa5d709283ea9f2fdf42e8205c96e64c1cbee06
parent 0b9147198ed62548a59b4b427c8b5d512be31249
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1783647135 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1783647135 -0700

Merge cherrypicks of ['googleplex-android-review.googlesource.com/39530637'] into 25Q2-release.

Change-Id: Ibe0976c975e292acac100c37d4c9325dc1878ae6