Merge "Revert "Return null for contacts local account""