am 73468ee8: (-s ours) am 5a16eba2: am eef99138: Merge "updater: Remove the unused isunresumable in SaveStash()." * commit '73468ee8':