Merge "Changing setPreferredData so that it takes subId."
am: fbc4e55540

Change-Id: Ibc451d0b459e2df383ff17b316db7f16a6ead29a