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

Change-Id: I50fdba197aa5441818c0f16b71002b80bf73f49b