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

Change-Id: I062a7bf67678f78f60f360df0590c9b12b9c75a5