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

Change-Id: Iab96a457f45f759267b9a5a41df533c9988ede94