Fix lock order violation
am: 064e9d401c

* commit '064e9d401c49d3789b5deeeb6b423a4f551e4206':
  Fix lock order violation