Merge cherrypicks of ['googleplex-android-review.googlesource.com/31574310', 'googleplex-android-review.googlesource.com/32920950', 'googleplex-android-review.googlesource.com/33868087'] into 24Q3-platform-release.

Change-Id: If8c55d7c862b68773b22392bdccbad46e0df16d1