TLOG steals image_id

Change-Id: Ib643cc7a3696917ed93b571223406fbfbee118ea
Closes-bug: 1383894
Merge "TLOG steals image_id"