Merge "Fix lock order violation"
am: 943a70f416

* commit '943a70f416ba19b0b05265ecca526311a6ae330c':
  Fix lock order violation