am 8a6cd189: am f60564a1: Merge "Use asynchronous lock/unlock API"

* commit '8a6cd189034ec4709a66e581b41deba56c028291':
  Use asynchronous lock/unlock API