Merge "Fix animation sequence for upload tasks"
am: 7f2676a3d9

Change-Id: Id281265f87e4670ec322d33384422b02ca7fd50b