Merge "Changing setPreferredData so that it takes subId."