am 0ab4c5c0: Merge "Change lock ordering to prevent violation."

* commit '0ab4c5c05f0b38a13d2897dc50143f00811529d1':
  Change lock ordering to prevent violation.