Merge "Update uniqueId association native methods"