Merge "Remove extraneous semicolon from namespace-closing curly brace; was breaking some builds."