Use Python 2.6.x compatible syntax for dict comprehension

The dict comprehension syntax used here was added in 2.7.
With minimal change it can be adjusted for Python 2.6.x

Change-Id: I920c4a4181fdf5c696ba873224a2c07f09e914e4
Merge "Use Python 2.6.x compatible syntax for dict comprehension"