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

Change-Id: Id5fed6a4385d6511688589a324a8d6b1f737140a