Merge cherrypicks of ['googleplex-android-review.googlesource.com/28231687', 'googleplex-android-review.googlesource.com/28240994'] into 24Q3-release.

Change-Id: I01869591a2667594683184770641529b09bcd80c