Merge \"Revert \"Revert \"Optimize IMT\"\"\"
am: 83e4903f9f

Change-Id: I8e62c7310ad66948716d8e5a628022b4f92c7f86