Remove client key.json generation for trust Upstream-commit: a29837020b02d94ea6065116e0b60c3290c5d40f Component: engine