Changes for flake8 compliance

Change-Id: I2f0152251c18f5cb695d74e904bf7430f389f475