This is an automatic reformat, performing the following:
- remove trailing whitespace
- organize imports
- make arguments final
- add explicit braces
- use diamond for instantiation
Change-Id: I08f578bf40b72c0a592f3adf5add4a275c376f3d Signed-off-by: Robert Varga <robert.varga@pantheon.tech>