Merge "Adds a filtering bitmask to DownloadStateCallback" am: 177bd65211 am: 387b90aa97 am: 6ed82dc67b
am: 548a7e607d

Change-Id: I7faf8cfe158eb1ca59bdd900bb5cb23df8406519