Merge "Quick fix for possible deadlock in LMS" into rvc-dev am: 45b8146a am: 10531c2f am: b688a8c7 Change-Id: I7e7b6fadff48de4e0a7c752162605fa16acdbbc3