adjust settingsprovider defaults for transition

Change-Id: Icd0dd53f85f1ed952a02ee13810f16e5f325b616