Merge \"Fixes and cleaning for test/458-checker-instruction-simplification.\"
am: 337fcb78e2

Change-Id: I8aa22fc03dd4586c63487c9839a36399b87d3ce7