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

Change-Id: I244729407cd336a0902f99f7694cb495c2cd4bc5