Correct use of noqa

The use of "#flake8: noqa" disables hacking checks for the entire
file. Switched to use of "# noqa" and fixed hacking problems.

Change-Id: I18785fb18bdce88e61e2451960e55aed0863c285