Merge cherrypicks of ['googleplex-android-review.googlesource.com/26024128', 'googleplex-android-review.googlesource.com/26101488'] into 24Q1-release.

Change-Id: I74be43df7b722691e0807c385e6a867a28ddb9ff