Merge "Add owners for locksettings unit tests"