Fix fatal, $settingsObject got lost in refactoring

Change-Id: I5394f0750be7b4363d36efb9861ee15f42f75e7c
Merge "Fix fatal, $settingsObject got lost in refactoring"