Merge cherrypicks of ['googleplex-android-review.googlesource.com/26710088'] into 24Q2-release.

Change-Id: I0f8c618efe6f4a14ae0caca77073bd1ad36b46ff