This reverts commit73ece231eeand reapplies7bfcdbcbf3with mlir changes. Also reverts commit423ba12971and includes the unit test changes of16da214004.
This reverts commit73ece231eeand reapplies7bfcdbcbf3with mlir changes. Also reverts commit423ba12971and includes the unit test changes of16da214004.