Enabled H201 on tox and changes made in relevant files. Change-Id: I7e1f05d9f90b11ac89b371e66ed9a0010462ad01