fix lock issue

Change-Id: I321f258351ed6aaf32360b356ef2c74860b7a805