am 60f9b2be: Merge "Fix failure to save a new contact with a photo."

* commit '60f9b2be12df79759203a9933c7b1711c74d6345':
  Fix failure to save a new contact with a photo.