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

Change-Id: Ie4bbe9ccce0ffb87f565866b0cb9929029295995