Merge "Fix long lines (>100) in ContactsProvider"