Merge "updater: Minor clean up to EnumerateStash()." am: 4fc7659612
am: 8209daeff1

Change-Id: I1a6540650a9a7f9b4252bf20e6ac2eb8c59e5642