Merge "Remove sharpening as an optimization pass."
am: c1ecc9b64a

Change-Id: Ia89e6ee928f70e24639beade9676a08364e15a71