Merge "Remove duplicate code when constructing PhotoInfo proto."