Merge cherrypicks of ['googleplex-android-review.googlesource.com/28255837', 'googleplex-android-review.googlesource.com/28292328', 'googleplex-android-review.googlesource.com/28292329'] into 24Q3-release.

Change-Id: Iecd1587b163bf63ff24cbbae002d225016987a35