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

Change-Id: I37db6aafdcfc1a264b4d18fa215bf33bacc19e89