fix some pep8 errors

46      E713 test for membership should be 'not in'
using a semi-automated script

Change-Id: I7ca12dbc3a0ec634d8ebea18637e110109aacb68
Merge "fix some pep8 errors"