Merge cherrypicks of ['android-review.googlesource.com/3560366',...

Merge cherrypicks of ['android-review.googlesource.com/3560366', 'android-review.googlesource.com/3560367', 'android-review.googlesource.com/3560368', 'android-review.googlesource.com/3562025'] into 25Q3-release.

Change-Id: I9277cffd965d89e92f22437cea7a0b13d589455a