Fix another deadlock between IMMS and TSMS
am: e3e31a8801

Change-Id: I4c622e7e55eedb5667b5e89f6fea51b262c4ae75