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

Change-Id: Ifaa70db9dbc3561e4d051cd72416a8ace136d19d