Merge \\"Refactor GetIMTIndex\\" am: 8a0b9bf88a
am: 4ecaa2315d

Change-Id: I4bba6907cc4100998a46e10d4ed7d85caba57444