Merge "Add SettingsGoogleUnitTests to TEST_MAPPING"