Merge "tests: Add ResumableUpdaterTest." am: a21a63bf56 am: 1d33962b86
am: 98dc45f0f0

Change-Id: I91ac11e21f98f1428d3541d26cffa6ba907e9ebb