tree 216d4634c29f064c64ac640d14ebf1d0f4c57667
parent 7cde2d7886d78555adc6c0953f41c307cd42d64a
parent 1dadfef121808917f9a436f71df19e1e10c6fed8
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1718645104 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1718645104 +0000

Merge cherrypicks of ['googleplex-android-review.googlesource.com/26866467', 'googleplex-android-review.googlesource.com/27576515'] into sparse-11973172-L60000030004607106.
SPARSE_CHANGE: I47b8b72a5a5c4098b46f0b5dbbf0654513b03aee
SPARSE_CHANGE: If4ab3030cfa1f9faed5d099077e5e3bab2cba622

Change-Id: Iaea9f3b59405e47a96dc48cc4df136185a64af6a