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

Change-Id: Ie53724738d03d4607352c9179fb604843e2d680b