More Python3 syntax errors fixed.

Change-Id: Ie072b4d8b6b806f46dd3ac245fe315b53b4ba2fd