Merge cherrypicks of ['googleplex-android-review.googlesource.com/31944105'] into 24Q3-platform-release.

Change-Id: I95127ff47c67035cb2c3317dba646db9aefd8ed6