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

Change-Id: Ib48e64646efb13507e4fe9ada1091cfcf5a13d50