am e68dde41: am 6cc88a7e: Merge "Disable kNoOutputOverlap optimization."

* commit 'e68dde410a0dd1a2ae20984653750d34e196c5ff':
  Disable kNoOutputOverlap optimization.