Merge "Merge "Fix ComposeInitializerImpl" into udc-dev am: 8cc2ef1370 am: adc4e327c4"