Merge "Fix 552-checker-sharpening for PIC test."
am: 0d7dce8798

Change-Id: I506671a2ebc35556ea251ff6d1f8eaaeafd306a7