Merge \"Refactor GetIMTIndex\"
am: 8a0b9bf88a

Change-Id: I7cf1dc4ffd730edbb8ff13b3dd2e6678a29f2fdd