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

Change-Id: I9ef9324125f29405b985b88167fe18e0cb37e748