Merge \\"Optimizing: Do not depend on sharpening in test 450\\" am: 3ce4f88d3c
am: 48abef53d2

Change-Id: I80eb681d9ac41452f06d9631078e6fbcc6784890