Merge cherrypicks of ['googleplex-android-review.googlesource.com/28599120'] into 24Q3-release.

Change-Id: I8dfa0cfe2b6bdd8c2b0ef98c84bb5ea467a5724e