Updates to image API

bug: #1017982

Change-Id: I28f4b418251aa8862e853a5e48f636981d3dc62c
author: Diane Fleming
Merge "Updates to image API"