Merge "Change expected default value of setPreferredData"
am: 2e64868e1d

Change-Id: I611d994ae769f40d42adc6053af4ecdf97126369