Fix indentation

Fixes wrong indentation and import ordering.

Change-Id: Ibb5593118a32b79d74edc97bed0ac2dceaa5b881
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "Fix indentation"