Re-add image support.

Change-Id: Iaf6709a7b8604f884506df02d5be0eb1d6937711