Fix coding style from Ie40c0721ec (e9f01c9)

- Opening brace goes on the same line as the function definition
- No backslash before class name in @return

Change-Id: I4c43e047c36d0ce6e9c2344f6ee98786b2b8eac4