Make this run on python2.6

Change-Id: Ia124b4185df844086e0fe3fba88ef38e93a3aaef
Merge "Make this run on python2.6"