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

Change-Id: Id43b14a6898e01083aeb6419a1fd8f1f4104564a