Merge "Fix osdf csit failure by fixing logging"