am bd20e551: Merge "Use asynchronous lock/unlock API"

* commit 'bd20e551f64234142e1146f9fa4b2dcebbd72122':
  Use asynchronous lock/unlock API