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