Merge pull request #25132 from RudyLu/ime/Bug1077609_uplift_v2.1

Bug 1077609 - uplift to v2.1.
(cherry picked from commit f37fac7ad3e05f8c5fb964c738848b86a62bce05)
a=v2.0, bajaj.