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

Change-Id: I939ba1ae9f42a575553fb331d82ac7d946afa34d