--added support for device property filtering, see the changes in the sample build.gradle