Package filter in common pack

Change-Id: I3728244712966cf2245a79f2630ac46cb63f1d21