Merge "Split the DownloadStateCallback class into two" into pi-dev
am: ecd4709573

Change-Id: I09cdcd69729ac917ac7290d4e1efcf4d9dbc0530