Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev
am: 97258cd731

Change-Id: I1dc7bb61cbf636301aa12070732aff095ede9f2d