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

Change-Id: I071ec4b73a4e691c323af7e99ad1647280353b72
1 file changed