bugfix: deal with non-contact file being opened as contact file

Change-Id: I947aae321347b347e7437625fc517d3004591979
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0