Merge "Fix 552-checker-sharpening for MIPS32R6"
am: b98115251e

Change-Id: I1844b8d0bc5972d2b6a77170564d38882a08793e