Merge "Fixed return type of getContentNamespaces()"