Merge "Add uniqueId to IRemotelyProvisionedComponent"