Merge "Quick fix for possible deadlock in LMS" into rvc-dev am: 45b8146ae8 am: 98c1646443

Change-Id: I8378aa26a2c6edf6f2b3b72d39b370e7aac0d38c