The previous patch to update hacking and pycodestyle turned off some new errors to keep the patch smaller. Fix those errors here. Change-Id: Ib22f63e98eefb36b9b2a8be55c15271824408d5d