Merge "Store work lock type even it uses unified lock" into nyc-dev
am: 610fb8a3f2

* commit '610fb8a3f2dcdc66dbc4e31d92a08cc249b5ca7b':
  Store work lock type even it uses unified lock

Change-Id: I89e322d1f21964074a3deec2fcc9a507c496d36e