Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev