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

Change-Id: Iba84efe287e2a35d51693ceb76caa035c6efdf2f