Remove a redundant image_id variable

Instead of creating a new variable for image_id,
we can simply do image['id']

Change-Id: I7ea5eaa0d460b50019d3e5f39a327ba0419b7c69
7 files changed