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

Change-Id: Ia1d76ada477b6715431839cc4d1a485678ba03b9