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

Change-Id: I5bf530e58bbfd030f36b442fc42f43bd6bcd91c1