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

Change-Id: I6119ff4172f013032a703ef324276cef35447e52