Merge "Fix lock order violation" am: 943a70f416
am: c94119227a  -s ours

* commit 'c94119227a955c9db9582cdd1d5efab0e05a0b90':
  Fix lock order violation