am ea3a2f28: am 0675d374: am 86f77114: Merge "Don\'t auto-correct to non-whitelist shortcuts"

* commit 'ea3a2f28ab602d1e2b7d1540c1863638832ec83a':
  Don't auto-correct to non-whitelist shortcuts