Updated collection device filtering to work for android (bug 975063)