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

Change-Id: I27147443f7bfcc1ee47d8c40ec542739642dc077