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

* commit '52127644cd35df942c38d889a716e82615c44eb8':
  Revert "Don't use file ID of the removed photo"

Change-Id: I2cf58b8464ba45887a07f06a2c6b36d881cd5e1b