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

Change-Id: I96bde3102906110b68c9fed63f74e28b9454cc24