Merge "Remove more semicolons at the end of namespaces"