Merge \"Revert \"Revert \"Refactor GetIMTIndex\"\"\"
am: e4b1c86d13

Change-Id: I496ad384317e215aa09e1390079fdfe3f852723e