Merge cherrypicks of ['googleplex-android-review.googlesource.com/31498196'] into 25Q1-release.

Change-Id: Ie20cbbf02bf6058a00ae4932af230553b998e96a