Merge cherrypicks of ['googleplex-android-review.googlesource.com/29969131'] into 24Q4-release. Change-Id: I91658ffc3e8ddbb91448ab3202d23331c8114bf2