Merge "improve logging of errors when trying to resolve backrefs http://b/2371475"