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

* commit '49f0ca7660b340d89ed5892e3a38a6b66b279e5e':
  Change ObjectLock to take Handle instead of Handle pointer.