Merge "Fix lock ordering violation"
am: adc183c711

* commit 'adc183c711731049800d0798ed35a5bc9a681a61':
  Fix lock ordering violation