Added image_filter and volume_type_filter

Change-Id: I1a0ebaf54ac377541d45ab2afb10eff01118bc98
Merge "Added image_filter and volume_type_filter"