Fix SyntaxWarning under Python 3

Change-Id: I60cf7bc796b5cb4927cd92477e3eb26379f06316
Merge "Fix SyntaxWarning under Python 3"