Updated settings storage

Change-Id: I63f6b411816f1fae82a694eec4e711c011d0571c