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

Change-Id: Ie03131d71da4a01d6fa5ff805751ab928a58e904