Merge "updater: Move rev_sha1 addition before convertUserOptions"