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

Change-Id: I9efb43bac3f24619d3f485d6694d40a2bc40bc7e