am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1

* commit '140da7c4140f0536c3fad1f7be555ebd58055b63':