Merge \\\\"Revert \\\\"Revert \\\\"Optimize IMT\\\\"\\\\"\\\\" am: 83e4903f am: 295a8a75 am: e5cea6d1 am: 878bad5f Change-Id: Ided606394e766e0104813b2fdcae239e9d6677e5