Merge "Workaround multiple instance of AppComponentFactory."