Merge "ImageManager returns FiemapStatus." am: 70768af0fe am: d11a4aba6e

Change-Id: Ic9a9eddd895d73c534d47ab820578dd7114196c6