am cc25e233: am 1f00671e: Merge "Fix lock order checking violation."
am cc25e233: am 1f00671e: Merge "Fix lock order checking violation."

* commit 'cc25e233a959d3a5f8366a9c0ff6cc41f8d74bf1':
  Fix lock order checking violation.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst