Merge "Fix AutoSyncDataPreferenceControllerTest"