Merge "Handle external storage errors uniformly." into jb-mr2-dev