Fix changes from rebase

pep8: --config=/usr2/ebrunson/.config/pep8

Change-Id: I500ff2fa7cdfe5ad577ca42d2dbf8b34b830a8cb