Merge \"Optimize IMT\"
am: abdda2fb52

Change-Id: Ifac59a3c2f4a701bf6c856338973b691dd4216cd