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

Change-Id: I0940be87b3d988297eab9d3279f1a85081dfe825