Merge cherrypicks of ['googleplex-android-review.googlesource.com/28342319'] into 24Q3-release. Change-Id: I08c001d9de913fe78d86f1fddb04a538e18ecfe7