Merge "Optimizing: Do not depend on sharpening in test 569." am: 909147a304
am: 32c9a17fa0

* commit '32c9a17fa03f003fc567e7caccd96158e5315211':
  Optimizing: Do not depend on sharpening in test 569.