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

Change-Id: I96a183b3fead5040bbeb95e6dcecf1451436743a