[automerger skipped] Merge "Changing setPreferredData so that it takes subId." am: fbc4e55540 am: 2a0bb8b78a
am: 83048a8841  -s ours

Change-Id: I9c5f120fb1b22dfffd3953907faeb2635c0b0970