Merge "Use correct synchronization lock" into nyc-dev
am: 638cc6cac9

* commit '638cc6cac9e35ec5a1410ba2fd63550b53e699ab':
  Use correct synchronization lock

Change-Id: Ibc7475f21c585ae457412214986cc14ac9ecbe8b