Merge "Quick fix for possible deadlock in LMS" into rvc-dev am: 45b8146a am: 98c16464 am: 80280978 Change-Id: I998a4bf349e409ce38de32dbdc6e1be9e63c5b37