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

Change-Id: I8d0ca488177ee91de92d87d490f81fce3cb6567e