Remove redundant locking (#8894)

Change-Id: I2a5176fe0c329e66d9e7a87825fc99a03fb5d708