Merge "updater: Fix the broken case for apply_patch_check()." am: 9f2062657d
am: 923d41ccd5

Change-Id: I732705e595aadd1d50d33b4371393e54959014a6