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