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

Change-Id: Ib8a8c575c5e59ee689ff983b40848c709957a4ff