Merge cherrypicks of ['googleplex-android-review.googlesource.com/26874925'] into 24Q2-release. Change-Id: I3733a70cb31cc2dec9a548bd4f9a6c8d3ccf1951