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

Change-Id: Ibaee0f9fafc45b4077cdae7b336943e312bdf80e