Made GET_LOCK keys cover all rows for the id/group

Change-Id: I80da75c364c6de4dd0ec1cc9a4f68148145b8ae5
Merge "Made GET_LOCK keys cover all rows for the id/group"