am 873e048b: Merge "Avoid crash when re-saving new contact with photo." into jb-dev

* commit '873e048b14647e72fa095e1337ab63377649f44c':
  Avoid crash when re-saving new contact with photo.