Merge "updater: Minor clean up to EnumerateStash()."