Merge \\"Optimize IMT\\" am: abdda2fb52
am: 8b74c3ac03

Change-Id: I570e9038549a29e46f0c4035f3b97382de06141f