Merge "Fix lock ordering violation" am: adc183c711
am: b05ef624fe

* commit 'b05ef624fe26ce48d12ce0fb201087f8d9befecc':
  Fix lock ordering violation