Imporved code to follow Google Java Style 4.6.2, but checkstyle is unable to accuratly check this at the moment. Patch to checkstyle is pending.