Fix checkstyle warnings

Reorder imports and rename logger->LOG.

Change-Id: I75929957f0ec6d4f70d274c86f4de3a92c248a9a
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Fix checkstyle warnings"