Merge "Fix crash when viewing or editing contacts without account" into oc-dev
am: 00ab85ed13

Change-Id: I747cab998f608e627a86c5fa5b3ad49d816e07b0