[automerger skipped] Merge "Change expected default value of setPreferredData" am: 2e64868e1d am: e77fbed6b5
am: 7fb4f33d40  -s ours

Change-Id: I5bae60f42dc35aacb43bd59707c05638a0530109