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

Change-Id: I7007511cc50956c3d280ea5fb4af4e3de3b0658e