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

Change-Id: I4ee7a8bb40b18bfe164724e2096ade7cb811e069