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

Change-Id: I7e21778100b090044fb8e226b9051d1b78462485
Signed-off-by: Coastguard Worker <android-build-coastguard-worker@google.com>