[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary...

[automerger skipped] Merge "DO NOT MERGE: Disable SpellChecker in secondary user's direct reply" into pi-dev am: 319f57f0 -s ours am skip reason: subject contains skip directive am: 6abc77d4 am: eca2797f

Change-Id: I97c3d1ae13ad527b4782c30e6c7d9c5b3ac891fa