Merge "updater: Clean up CreateStash()." am: 91f74c82cd am: 719a15b187
am: fbb5dbb471

Change-Id: If1b1b5c2a52abde1cc6b860413efe935f326a63d