Merge cherrypicks of ['googleplex-android-review.googlesource.com/26722979'] into 24Q2-release.

Change-Id: Ifc73c80fc7085253485497f860bdc7f478c16fed