[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 am: f648b173

Change-Id: I3c0dce65316f3630885e1ea3a2ca96a978bc2010