Merge "Fix ComposeInitializerImpl" into udc-dev