Merge cherrypicks of ['googleplex-android-review.googlesource.com/26717940'] into 24Q2-release. Change-Id: If341f0bc07ad7f2e9fdc010c717fd10540c49a47