Merge "Re-synced MR1 and master for SpellChecker"