+ lock system modified

Change-Id: I79b33480feffd06654fb9a3b71f7e84e5aa7daf8