Make Image state depend on object.images.State class

Part of bug 1323168

Change-Id: Ief426710b769724ec5b8970f37592a2eeddd4515
Merge "Make Image state depend on object.images.State class"