Merge "Workaround to let SettingsUtils handle empty settings values." into qt-dev
am: 2953c8a606

Change-Id: I1b8e9762c09b62726245c6304a200477653f205e