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