Use Python 2.6 compatible list comprehension syntax

Change-Id: Ie4574d5243873f3ce0e7ecc567c641aa27aaf157
Merge "Use Python 2.6 compatible list comprehension syntax"