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

Change-Id: If5a3b232d4f5b1cf7b52be7decebb18681166123