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