Revert "Adjust locks for byo-matrix Core CI scenario"

This reverts commit 325e00b938d74c44ff7692263c377ce3882b49df.

Change-Id: I9ee05c3de4a7558df8881d57d81a726af270be8d
1 file changed