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: I98c209ec1c3fd63d2abd597f1f38d9fc86dd5275