am 6cc88a7e: Merge "Disable kNoOutputOverlap optimization."

* commit '6cc88a7e5ad695ce4f2651009231fd8f025d1a99':
  Disable kNoOutputOverlap optimization.