Merge "Rename hint service into performance_hint service"