Merge "Make sure photo_uri rewrite logic doesn\'t cause FileNotFoundException" into nyc-dev
am: 74fc057898

* commit '74fc057898957137fd72802a3bd753315df36b89':
  Make sure photo_uri rewrite logic doesn't cause FileNotFoundException