Organize imports and fix formatting

Test: m
Fixes: 215567445
Change-Id: I1077b3fb609acde6d6dbda92139f52ad8fed7784
1 file changed