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

Change-Id: If55a6b9246f964f43e75263937feec0475f4c9e1