Merge "Update comment in DefaultSettings for bug 17180"