Merge "Follow-up 8697ba8: No need for two dependencies on the same module"