Simplify list comprehension logic

Change-Id: I508172851f3baefe7464d6b4d10a1afeb4d84341
Merge "Simplify list comprehension logic"