Merge cherrypicks of ['googleplex-android-review.googlesource.com/28578533', 'googleplex-android-review.googlesource.com/28577572'] into 24Q3-release.

Change-Id: I6c8b24ebdfb0f2e05216208a0cc21769bb9cebf7