A new pep8 style library must have been released which is causing some new errors, E471 among them. Clean-up on aisle 8. Change-Id: I153abada74e8c522fe9866a239a36dbb8365a29e