Merge "repo_pull: Refactor error handling" am: d3639deadf

Change-Id: I27f62d9f0339cbd227056dd699823ff652b97d5b