Organize imports & remove a redundant import

Bug: 63742
Change-Id: Ib35817d3726790c533168e1656d28b3c0ab437d8
Explicitly use braces everywhere

Bug: 63742
Change-Id: I64a62880458c6915d3171569752b1d9dcd90e57a