Fix style errors and upgrade hacking

Change-Id: I632d69831e08ffa0d59e3418b673fade86facc2c