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