AI 144530: Refactor the huge codes in ImageManager. Extract member classes to top level.
  Fix style issue.

Automated import of CL 144530
33 files changed