Merge \"Revert \"Optimize IMT\"\"
am: bb8d501c9b

Change-Id: Id3b16cec52bf776741bb972c48bea9f6cf14a525