Merge "Remove logging dependency on runtime"