Merge "Add proto dump flag to services (1/2)"