Merge "Remove redundant namespaceAliases"