am 2aab528b: am 49f0ca76: Merge "Change ObjectLock to take Handle instead of Handle pointer."

* commit '2aab528bb1e2b90e8d08f87f8976b44f66ee21bd':
  Change ObjectLock to take Handle instead of Handle pointer.