Merge "Separate UserManager into api and implementation bundles"