Added support for image snapshots

Change-Id: I860458c8191736b567e8be11f7e3cc18effbde27