Fix another deadlock between IMMS and TSMS am: e3e31a8801
am: 7fa2d8cfed

Change-Id: Id34f9ce36ea64f453ac1e2584ef56fa191c76715