[automerger skipped] DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5 am: 9b1ddfe488 am: 4f5d0e446e -s ours am skip reason: subject contains skip directive am: 9238b76a83 -s ours am skip reason: subject contains skip directive am: 8dbea0e476

Change-Id: Ief059054a3c05cc08fa486f687d556087cbc5c1a