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