Flake8 fixes

Change-Id: Ie01e2bc6e355df1f1a98b222aef59afee4042c2f
Merge "Flake8 fixes"