Merge "Fix namespaces in reflected cpp code."