Merge "repo_pull: Refactor error handling" am: d3639deadf am: 38629e4d29

Change-Id: I7da8d58bf51381c7d4c18ae258e8f74b6a1de8fc