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

Change-Id: I476e05b611bace3cb8ca378e625de1f1fc83633a