Merge cherrypicks of ['googleplex-android-review.googlesource.com/29583007'] into 24Q4-release. Change-Id: Iefa032c3600aa0026dd09798db22d58784b7ec13