Merge cherrypicks of ['googleplex-android-review.googlesource.com/36308516'] into 25Q4-release. Change-Id: Id55a537e85fac0052295dfee1486e321579c8c71