am 54a2a6df: (-s ours) Merge "Merge "Fix length of pattern." DO NOT MERGE."

* commit '54a2a6df410ad860f048ef4ff653820787f68f3a':
  Merge "Fix length of pattern." DO NOT MERGE.