Merge "(bug 42787) Make import robust against corrupt content."