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

Change-Id: Iffbf98ba50195e55b7acf1b556f2b9ed7fc5300d