Merge "Support image classes filtering in image writer" am: ea6e755688
am: 579325fc0f

* commit '579325fc0fde4a96405ac354f1ec7fb3a1c2c56c':
  Support image classes filtering in image writer