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

Change-Id: I2a0bff21758253062559b1fde43c33e7183e5472