Merge "Fix SettingsTest#testSecureTable" into froyo