Merge "Don\'t use file ID of the removed photo" into nyc-dev
am: cf0734b567

* commit 'cf0734b567b77bab782c533214ebe4e044a04f9c':
  Don't use file ID of the removed photo