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