am 1c637c5f: Merge "Remove needless locking of mRulesLock that caused deadlocks." into lmp-dev

* commit '1c637c5fef678a82fd1f2c380d41ed6ebcb5bf2e':
  Remove needless locking of mRulesLock that caused deadlocks.