Merge "Enable namespaces for all target sdk versions"