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

Change-Id: I90ce026e60bf4a7542f4949514312de882a82f9b