am: 610fb8a3 * commit '610fb8a3': Store work lock type even it uses unified lock Change-Id: I98c209ec1c3fd63d2abd597f1f38d9fc86dd5275