am 7d0d203d: (-s ours) am 23894199: am f356a25f: [DO NOT MERGE] Fix a bug where autocaps would jam auto-commit

* commit '7d0d203d205433c098e46e56e265009c13dcdeb1':
  [DO NOT MERGE] Fix a bug where autocaps would jam auto-commit