Merge "repo_pull: Refactor error handling" am: d3639deadf am: 38629e4d29 am: 33e1ca8aab am: c4ed863db5

Change-Id: Icc56170d8f595598cc6b13e10de4d816e820b3ae