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

Change-Id: I364a1d62306ec11434ed74877143fc3c50e7abdf