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

Change-Id: I93a4aa4b006c385204da86343d271c68b19d1ae2