Fix pep H101(TODO) and H231(py3 exceptions)

Change-Id: I6797c4df1595466a12f84721a383eb541e6401f7
Merge "Fix pep H101(TODO) and H231(py3 exceptions)"