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

Change-Id: I40ab3875937e5d443fc62b800f7ddaae1166cbbf