Merge "Use per character suffix for multi image"
am: 39731ac67b

* commit '39731ac67b591d84711a34f671a48229933cddc7':
  Use per character suffix for multi image