Merge "Disable DX workaround for 611-checker-simplify-if"
am: d07e065b30

Change-Id: I67479236e17e1cec5ef220a1d8a3c2afead6ee78