Merge "Update the OWNERS file for locksettings"