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