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