Merge cherrypicks of ['googleplex-android-review.googlesource.com/26024611', 'googleplex-android-review.googlesource.com/26030060', 'googleplex-android-review.googlesource.com/26037585'] into 24Q1-release.

Change-Id: Iee2cb9b2cd05cb9fdd53b84a5332720b3af1305a