Merge "TrivialFix: Remove logging import unused"