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

* commit '0488c3d83099c4d82f5ddc41c045bc7b7833de29':
  Revert "Don't use file ID of the removed photo"

Change-Id: Ifbdb9af436ddde7fb70fc6d718338ef27d558efd