Merge "Add support for adding module in the same class annotated with @DialerRootComponent."