Merge "Update comment and remove unwanted FIXME in SchemaSetup"