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

Change-Id: I218ac590168ee5ea6a10a0156942f655ad0764a0