Merge cherrypicks of ['googleplex-android-review.googlesource.com/30871122'] into 25Q1-release. Change-Id: I9fb08d6785f07a8aafe737502628c0ea4df55388