Merge "Merge "Store work lock type even it uses unified lock" into nyc-dev am:...
Merge "Merge "Store work lock type even it uses unified lock" into nyc-dev am: 610fb8a3 am: 56181175" into nyc-mr1-dev-plus-aosp
am: 26bbadc4
* commit '26bbadc4':
Change-Id: Id06de5146cc22a6ac86f00c734f4131b16d345c7