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

Change-Id: Ie9f6bf7be41826da6e49044f0d258e4df0a069ce