Merge cherrypicks of ['googleplex-android-review.googlesource.com/31391282', 'googleplex-android-review.googlesource.com/31391537', 'googleplex-android-review.googlesource.com/31391773'] into 25Q1-release.

Change-Id: Id2c5a47139617322cddae51c89cd6eb970c5f52d