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