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

Change-Id: I659a3472d000c091e35caf5dcaebd7d50cd3e52c