Merge "Add hacking import exception for service clients"