Merge "updater: Fix a bug in DeleteFn()." am: 529032f4a0 am: 4f91ca78b9
am: 786b083b8e

Change-Id: I835b4c749747b705cb78441b8e405b21a2198f56