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

Change-Id: Ieca04072f0f335169aeb00467fcef1cd14028fc1