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

Change-Id: I9b68d49950154e68080fa768ebfc38648d3fb48f