Merge "Make sure photo_uri rewrite logic doesn't cause FileNotFoundException" into nyc-dev