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

Change-Id: I998a4bf349e409ce38de32dbdc6e1be9e63c5b37