Merge "Remove extra semicolon at end of namespace"