Merge cherrypicks of ['googleplex-android-review.googlesource.com/33641943', 'googleplex-android-review.googlesource.com/33706933'] into 25Q2-release. Change-Id: Ib9ba07c9b49d155a89de771733d54b80f00dc83a