Merge "Use the correct dependency" into ics-factoryrom