Merge cherrypicks of ['googleplex-android-review.googlesource.com/29764306'] into 24Q4-release. Change-Id: I189631de67329af60ffc56b821ca95d14d0c17ec