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

Change-Id: I3433e0a5c53574f550cd67777a85262a1f7970ca