Merge "making changes to settingsLib so we can create car setting using settingsLib"