Merge "Merge "Adds a filtering bitmask to DownloadStateCallback" into oc-mr1-dev am: dbe2815199  -s ours am: bdfcee88f2  -s ours"