Move filterspecs from andsome.

Change-Id: Ie181e0ed089abf1f7422254a2f88ce4edc17861a