Merge "Split the DownloadStateCallback class into two"
am: aa8f09d41a

Change-Id: Id31521d2a138a0a3ef98ea5a56d19621c757dc90