Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev